Remove stray blexit()
authorRoy Franz <roy.franz@linaro.org>
Mon, 13 Oct 2014 19:56:29 +0000 (12:56 -0700)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 14 Oct 2014 09:16:38 +0000 (10:16 +0100)
A stray call to blexit() was in the normal processing path for handling
FDTs specified in the config file, causing the EFI boot code to
unconditionally exit.  Remove the blexit() call as it should never
have been here.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Tested-by: Vijaya Kumar K<Vijaya.Kumar@caviumnetworks.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
xen/arch/arm/efi/efi-boot.h

index 61cb13ad21dcaf35a08bfa7ebb3206856ec9f3d1..7abc059a75e206160eb95bfb6a09f43b4e4becbc 100644 (file)
@@ -359,7 +359,6 @@ static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *sec
     {
         split_string(name.s);
         read_file(dir_handle, s2w(&name), &dtbfile, NULL);
-            blexit(NULL);
         efi_bs->FreePool(name.w);
     }
     fdt = fdt_increase_size(&dtbfile, cfg.size + EFI_PAGE_SIZE);